Fix duplicate labels emitted in `render_multispan_macro_backtrace()` #116838

gurry · 2023-10-17T08:19:12Z

This PR replaces the Vec used to store labels with an FxIndexSet in order to eliminate duplicates

Fixes #116836

rustbot · 2023-10-17T08:19:21Z

r? @petrochenkov

(rustbot has picked a reviewer for you, use r? to override)

compiler/rustc_errors/src/emitter.rs

petrochenkov · 2023-10-17T10:18:58Z

@bors r+ rollup

bors · 2023-10-17T10:19:01Z

📌 Commit 88c8714 has been approved by petrochenkov

It is now in the queue for this repository.

… r=petrochenkov Fix duplicate labels emitted in `render_multispan_macro_backtrace()` This PR replaces the `Vec` used to store labels with an `FxIndexSet` in order to eliminate duplicates Fixes rust-lang#116836

…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#116717 (Special case iterator chain checks for suggestion) - rust-lang#116719 (Add MonoItems and Instance to stable_mir) - rust-lang#116787 (Implement an internal lint encouraging use of `Span::eq_ctxt`) - rust-lang#116827 (Make `handle_options` public again.) - rust-lang#116838 (Fix duplicate labels emitted in `render_multispan_macro_backtrace()`) r? `@ghost` `@rustbot` modify labels: rollup

matthiaskrgr · 2023-10-17T17:06:29Z

@bors r- #116848 (comment)

Using hash set instead of vec to weed out duplicates

gurry · 2023-10-19T03:35:29Z

@matthiaskrgr I've fixed the failing test

@rustbot label -S-waiting-on-author +S-waiting-on-review

petrochenkov · 2023-10-19T20:24:39Z

@bors r+

bors · 2023-10-19T20:24:40Z

📌 Commit 0091166 has been approved by petrochenkov

It is now in the queue for this repository.

bors · 2023-10-20T02:07:08Z

⌛ Testing commit 0091166 with merge ae466d2...

bors · 2023-10-20T04:00:00Z

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing ae466d2 to master...

rust-timer · 2023-10-20T05:29:56Z

Finished benchmarking commit (ae466d2): comparison URL.

Overall result: no relevant changes - no action needed

@rustbot label: -perf-regression

Instruction count

This benchmark run did not return any relevant results for this metric.

Max RSS (memory usage)

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	-	-	0
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-3.4%	[-3.4%, -3.4%]	1
All ❌✅ (primary)	-	-	0

Cycles

Results

This is a less reliable metric that may be of interest but was not used to determine the overall result at the top of this comment.

	mean	range	count
Regressions ❌ (primary)	-	-	0
Regressions ❌ (secondary)	4.1%	[1.7%, 10.7%]	6
Improvements ✅ (primary)	-	-	0
Improvements ✅ (secondary)	-	-	0
All ❌✅ (primary)	-	-	0

Binary size

This benchmark run did not return any relevant results for this metric.

Bootstrap: 630.247s -> 630.044s (-0.03%)
Artifact size: 304.06 MiB -> 304.02 MiB (-0.01%)

rustbot assigned petrochenkov Oct 17, 2023

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 17, 2023

petrochenkov reviewed Oct 17, 2023

View reviewed changes

compiler/rustc_errors/src/emitter.rs Outdated Show resolved Hide resolved

petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 17, 2023

gurry force-pushed the 116836-dup-macro-invoc-diag branch from e59e7d3 to 88c8714 Compare October 17, 2023 10:16

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 17, 2023

matthiaskrgr mentioned this pull request Oct 17, 2023

Rollup of 5 pull requests #116848

Closed

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Oct 17, 2023

Fix duplicate labels emitted in render_multispan_macro_backtrace()

0091166

Using hash set instead of vec to weed out duplicates

gurry force-pushed the 116836-dup-macro-invoc-diag branch from 88c8714 to 0091166 Compare October 19, 2023 02:34

rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Oct 19, 2023

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Oct 19, 2023

bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 20, 2023

bors merged commit ae466d2 into rust-lang:master Oct 20, 2023
12 checks passed

rustbot added this to the 1.75.0 milestone Oct 20, 2023

github-actions bot mentioned this pull request Oct 31, 2023

Automated pull from upstream master ferrocene/ferrocene#74

Merged

gurry deleted the 116836-dup-macro-invoc-diag branch January 5, 2024 04:56

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix duplicate labels emitted in `render_multispan_macro_backtrace()` #116838

Fix duplicate labels emitted in `render_multispan_macro_backtrace()` #116838

gurry commented Oct 17, 2023 •

edited

Loading

rustbot commented Oct 17, 2023

petrochenkov commented Oct 17, 2023

bors commented Oct 17, 2023

matthiaskrgr commented Oct 17, 2023

gurry commented Oct 19, 2023

petrochenkov commented Oct 19, 2023

bors commented Oct 19, 2023

bors commented Oct 20, 2023

bors commented Oct 20, 2023

rust-timer commented Oct 20, 2023

Fix duplicate labels emitted in render_multispan_macro_backtrace() #116838

Fix duplicate labels emitted in render_multispan_macro_backtrace() #116838

Conversation

gurry commented Oct 17, 2023 • edited Loading

rustbot commented Oct 17, 2023

petrochenkov commented Oct 17, 2023

bors commented Oct 17, 2023

matthiaskrgr commented Oct 17, 2023

gurry commented Oct 19, 2023

petrochenkov commented Oct 19, 2023

bors commented Oct 19, 2023

bors commented Oct 20, 2023

bors commented Oct 20, 2023

rust-timer commented Oct 20, 2023

Overall result: no relevant changes - no action needed

Instruction count

Max RSS (memory usage)

Cycles

Binary size

Fix duplicate labels emitted in `render_multispan_macro_backtrace()` #116838

Fix duplicate labels emitted in `render_multispan_macro_backtrace()` #116838

gurry commented Oct 17, 2023 •

edited

Loading